From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 9 Apr 2008 15:04:10 +0000 (+0100)
Subject: x86: Suppress scary console message from sh_remove_shadows()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14231^2~40
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=fc7e83c464aa65cadb594a954f763bd0c8aad8ad;p=xen.git

x86: Suppress scary console message from sh_remove_shadows()
except in cases where the guest's behaviour is unrecoverable.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 1816fe397b..d7239cde77 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2172,13 +2172,12 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all)
 #undef DO_UNSHADOW
 
     /* If that didn't catch the shadows, something is wrong */
-    if ( !fast && (pg->count_info & PGC_page_table) )
+    if ( !fast && all && (pg->count_info & PGC_page_table) )
     {
         SHADOW_ERROR("can't find all shadows of mfn %05lx "
                      "(shadow_flags=%08lx)\n",
                       mfn_x(gmfn), pg->shadow_flags);
-        if ( all ) 
-            domain_crash(v->domain);
+        domain_crash(v->domain);
     }
 
     /* Need to flush TLBs now, so that linear maps are safe next time we